Fix merge conflicts in ldefs-boot.el.
authorEli Zaretskii <eliz@gnu.org>
Sat, 3 Apr 2010 13:59:53 +0000 (16:59 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 3 Apr 2010 13:59:53 +0000 (16:59 +0300)
commitf943159109ecc6f3b8de31a8c9e03de76ed1282d
tree049f745fb416c1bdc57e3c2482b1f8e9042bed8d
parent37f576f27d7154fec0d9fd502795d4728494ee02
Fix merge conflicts in ldefs-boot.el.
lisp/ldefs-boot.el